Skip to content

Fix failed ios build after second info-plist merge #1083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 20, 2015

Conversation

Fatme
Copy link
Contributor

@Fatme Fatme commented Oct 19, 2015

Fixes #1066

@Fatme Fatme added this to the 1.4.3 milestone Oct 19, 2015
@ns-bot
Copy link

ns-bot commented Oct 19, 2015

Test PASSed.

return (() => {
let manifestPath = this.platformData.configurationFilePath;

console.log("ANDROID MANIFEST FILE PATH!!!!");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you need these console.logs

@ns-bot
Copy link

ns-bot commented Oct 19, 2015

Test FAILed.

this.replaceFileContent(pbxprojFilePath).wait();
}).future<void>()();
}

public interpolateConfigurationFile(configurationFilePath?: string): IFuture<void> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for this function to return a future?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@teobugslayer
Copy link
Contributor

Why there are changes in the Android specific code? Can you document them in the PR description, or separate them in another PR?

this.replaceFileName("-Info.plist", path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER)).wait();
this.replaceFileName("-Prefix.pch", path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER)).wait();
this.replaceFileName(IOSProjectService.XCODE_PROJECT_EXT_NAME, projectRoot).wait();
this.replaceFileName("-Info.plist", path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER)).wait();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can extract this long path into a dedicated variable - it is used on more than one place

@Fatme
Copy link
Contributor Author

Fatme commented Oct 20, 2015

This is the reason why I need the changes in the Android specific code - https://github.com/NativeScript/nativescript-cli/pull/1083/files#diff-513fe963f5d821a1cdb167ea91d70f1cR105. I cannot separate this in another PR, this change must be here.

@ns-bot
Copy link

ns-bot commented Oct 20, 2015

Test FAILed.

@Fatme Fatme force-pushed the fatme/fix-info-plist-merge branch from b710ba0 to 249576e Compare October 20, 2015 06:50
@ns-bot
Copy link

ns-bot commented Oct 20, 2015

Test FAILed.

@Fatme Fatme force-pushed the fatme/fix-info-plist-merge branch from 249576e to eb72914 Compare October 20, 2015 07:07
@Fatme Fatme force-pushed the fatme/fix-info-plist-merge branch from eb72914 to 2daee31 Compare October 20, 2015 07:10
@ns-bot
Copy link

ns-bot commented Oct 20, 2015

Test FAILed.

@ns-bot
Copy link

ns-bot commented Oct 20, 2015

Test PASSed.

@Fatme Fatme added the bug label Oct 20, 2015
@dtopuzov
Copy link
Contributor

👍

dtopuzov added a commit that referenced this pull request Oct 20, 2015
Fix failed ios build after second info-plist merge
@dtopuzov dtopuzov merged commit dab0364 into release Oct 20, 2015
@Fatme Fatme deleted the fatme/fix-info-plist-merge branch October 20, 2015 11:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants